Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Marge swiftparcel_web into development #120

Merged
merged 126 commits into from
Oct 17, 2024
Merged

Marge swiftparcel_web into development #120

merged 126 commits into from
Oct 17, 2024

Conversation

SaintAngeLs
Copy link
Owner

There will be the conflict, but this step is importatn for mergin the swiftparcel_web in the dovelopement

SaintAngeLs and others added 30 commits January 13, 2024 08:45
@SaintAngeLs
#110: creating new branch
1385a43
@SaintAngeLs
#110: migrating to docker-space
d2cad19
@SaintAngeLs
#110: migrating to docker-space
90011b7
@SaintAngeLs
#110: SwiftParcel directory update
3224210
@SaintAngeLs
#110: appsettings updates
d0cd674
@an2508374
#112: add frontend from frontendUpdate to backend from development
30bf22a
@an2508374
#112: update ntrada.yml file in ApiGateway
e8189d5
@an2508374
#112: add ClientId and ClientSecret for Google Authentication in Iden…
37132d6 
…tity
@an2508374
#112: update sign-up post response in IdentityService
18c5aa5
@an2508374
#112: update orders post response in OrdersService
bbe727b
@an2508374
#112: update parcels post response in ParcelsService
f4a48c0
@an2508374
#112: fix setting isCompany and vipPackage fields during adding new p…
b0fbf2a 
…arcel in ParcelsService
@an2508374
#112: update necessary validation for MiniCurrier in createInquiry
456dfbb
@an2508374
#112: update get orders handler in OrdersService
a3136d9
@an2508374
#112: update sync with backend of confirm and cancel for user
192eb9c
@SaintAngeLs
#110: transfering deployment to droplet
70b7de9
@eggwhat
#113: update auth keys
bdad087
@eggwhat
#113: update auth header
ee899e6
@eggwhat
#113: fix typo
90b5494
@SaintAngeLs
#110: deviding appsettings into developemnt and production
2d75f94
@SaintAngeLs
#110: addin production environment to apigateway
8788b3d
@SaintAngeLs
#110: updating the scripts
c92cb52
@eggwhat
#113: update ntrada file to fix registration
23ba48a
@eggwhat
#113: fix security issue in deliveries
5d0446a
@eggwhat
#113: fix security issue in deliveries
cb484c2
@eggwhat
#113: fix missing data extracted from mongo orders
442371f
@an2508374
#60: some fixes in inquiry details modal
e04bdf8
@an2508374
#60 (#95): update header for courier
b4811b0
@an2508374
#60 (#95): add delivery page for courier
75afe4f
@an2508374
#60 (#95): update delivery details modal for courier
b50af5c
@SaintAngeLs
#110: update the workflow file
19f4bc9
@SaintAngeLs
#110: package.json update
69275d2
@SaintAngeLs
#110: update the utils/api
535f471
@SaintAngeLs
#110: update the frontend configuration file
ebaf7cf
@SaintAngeLs
#110: update the port frontned is running on
c80809b
@SaintAngeLs
#110: update the frontend configuration file
dbf52ad
@SaintAngeLs
#110: update the frontend image
a2fb72a
@SaintAngeLs
#110: update the nginx.conf
505396b
@SaintAngeLs
#110: nginx update
cd5df8e
@SaintAngeLs
#110: update the nginx.conf
c5081d2
@SaintAngeLs
#110: update the dockerfile fo the frontned
07576f6
@SaintAngeLs
#110: update the dockerfile fo the frontned
cff8a05
@SaintAngeLs
#110: update the dockerfile fo the frontned
022e9c2
@SaintAngeLs
#110: nginx update
0bf3c06
@SaintAngeLs
#110: nginx update
2b44ac3
@SaintAngeLs
#110: nginx update
e513128
@SaintAngeLs
#110: nginx update
6fb5091
@SaintAngeLs
#110: nginx update
f7e6414
@SaintAngeLs
#110: nginx update
494cbf9
@SaintAngeLs
#110: nginx update
bf642e2
@SaintAngeLs
#110: nginx update
018926d
@SaintAngeLs
#110: nginx update
0422fd4
@SaintAngeLs
#110: nginx update
fa26a31
@SaintAngeLs
#110: nginx update
52e9d84
@SaintAngeLs
#110: nginx update
82c8264
@SaintAngeLs
#110: nginx update
569f40e
@SaintAngeLs
#110: nginx update
8ffc72f
@SaintAngeLs
#110: nginx update
6336aa9
@SaintAngeLs
#110: nginx update
6e1219b
@SaintAngeLs SaintAngeLs merged commit 2897165 into development Oct 17, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@an2508374 an2508374 an2508374 approved these changes

@eggwhat eggwhat Awaiting requested review from eggwhat

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@SaintAngeLs @an2508374 @eggwhat